x86_64 build
i386 build and x86_64 build fixes