Fixed some bugs due to new EFI