Fixes to tuckbox