Backport a few patches from Barrier Breaker to improve grub2 support
Some (unfinished) x86 support