Efi fixes

This branch contains the fixes needed by the EFI porting task.
Please review.