Fixed x64/x86 compatibility, namespace changes