Fix UEFI issue #63 and #65. Needs testing. Thanks to the Manjaro guys.