diff --git a/includes/class-gravityview-uninstall.php b/includes/class-gravityview-uninstall.php
index d202e91490..eabd648273 100644
--- a/includes/class-gravityview-uninstall.php
+++ b/includes/class-gravityview-uninstall.php
@@ -41,7 +41,7 @@ private function delete_entry_meta() {
 
 		$tables = array();
 
-		if ( version_compare( self::get_database_version(), '2.3-dev-1', '>=' ) ) {
+		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
 			$tables []= GFFormsModel::get_entry_meta_table_name();
 		}
 		$tables []= GFFormsModel::get_lead_meta_table_name();
@@ -69,7 +69,7 @@ private function delete_entry_notes() {
 
 		$tables = array();
 
-		if ( version_compare( self::get_database_version(), '2.3-dev-1', '>=' ) ) {
+		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
 			$tables []= GFFormsModel::get_entry_notes_table_name();
 		}
 		$tables []= GFFormsModel::get_lead_notes_table_name();
diff --git a/includes/extensions/edit-entry/class-edit-entry-render.php b/includes/extensions/edit-entry/class-edit-entry-render.php
index 175e70935f..73f44c3b38 100644
--- a/includes/extensions/edit-entry/class-edit-entry-render.php
+++ b/includes/extensions/edit-entry/class-edit-entry-render.php
@@ -357,7 +357,7 @@ private function process_save() {
 	private function unset_hidden_field_values() {
 		global $wpdb;
 
-		if ( version_compare( self::get_database_version(), '2.3-dev-1', '>=' ) ) {
+		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
 		} else {
@@ -853,7 +853,7 @@ private function after_update() {
 
 		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
-		if ( version_compare( self::get_database_version(), '2.3-dev-1', '<' ) ) {
+		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
 			// We need to clear the cache because Gravity Forms caches the field values, which
 			// we have just updated.
 			foreach ($this->form['fields'] as $key => $field) {