Fixes due to Boot Upgrade

This change contains additional fixes needed for the latest Boot
upgrade.