Add support for x86_64

_needed by tests