Tidy up for Boot 1.0.0.RC4