Fixes some of the box bugs.