Fixed issues which arose on x86_64 architecture