Fixes to the box