Fixes to bios from previous app merge