Updates and fixes for x86_64 devices