diff --git a/lib/documentmanagement/documentmetadataversion.inc.php b/lib/documentmanagement/documentmetadataversion.inc.php
index 59edc78..e196ed1 100644
--- a/lib/documentmanagement/documentmetadataversion.inc.php
+++ b/lib/documentmanagement/documentmetadataversion.inc.php
@@ -106,7 +106,6 @@ class KTDocumentMetadataVersion extends KTEntity {
     	$this->_aFieldToSelect = KTDocumentMetaDataVersion::getFieldsToSelect();
     }
     
-    static 
     function getFieldsToSelect() {
     	if(self::$_versionFields == null) {
     		$sTable = KTUtil::getTableName('document_metadata_version');
@@ -120,7 +119,6 @@ class KTDocumentMetadataVersion extends KTEntity {
     	return self::$_versionFields; 	
     }
     
-    static
     function getFieldType($dbType) {
     	/* Integer test */
     	if(strpos($dbType, "int") !== FALSE) {
diff --git a/lib/ktentity.inc b/lib/ktentity.inc
index df3091c..e82e281 100644
--- a/lib/ktentity.inc
+++ b/lib/ktentity.inc
@@ -743,6 +743,10 @@ class KTEntityUtil {
         $allcode[] = sprintf('var $cacheGlobal = null;%s', "\n");
 
         foreach ($methods as $sMethod) {
+        	if(substr($sMethod, 0, 2) == '__') {
+				/* We don't want magic functions in our proxy classes */
+				continue;
+			}
             if ($sMethod == 'getid') {
                 $code = sprintf('function getId() { return $this->iId; }');
     		} else if ($sMethod == '_table' || $sMethod == 'update' ) {