Update BIOS handling as per upstream