Some fixes for boosts.