Bonus box fixes