corrections and simplify efi mount