Fix for latest Boot changes