Try making it all work on architectures beyond x86/64