diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl
index 3b153f56..a12e2457 100644
--- a/modules/modpython/codegen.pl
+++ b/modules/modpython/codegen.pl
@@ -279,7 +279,7 @@ while (<$in>) {
 			when ('bool') {
 				say $out "Py_BuildValue(\"l\", (long int)$a->{var});";
 			}
-			when (/^E/) {
+			when (/(?:^|::)E/) {
 				say $out "Py_BuildValue(\"i\", (int)$a->{var});";
 			}
 			default {
diff --git a/modules/modpython/functions.in b/modules/modpython/functions.in
index 2c835e30..c12db06c 100644
--- a/modules/modpython/functions.in
+++ b/modules/modpython/functions.in
@@ -61,4 +61,4 @@ void OnServerCapResult(const CString& sCap, bool bSuccess)
 EModRet OnTimerAutoJoin(CChan& Channel)
 bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl)=false
 
-EModRet OnModuleLoading(const CString& sModName, const CString& sArgs, EModuleType eType, bool& bSuccess, CString& sRetMsg)
+EModRet OnModuleLoading(const CString& sModName, const CString& sArgs, CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg)