Minor fixes, x64 support