Fixes for Boot 1.1