Adding fixes to Boot.