Fixing support for amr64, x86_64 architectures