Fix issues on x86_64 Linux