More box fixes.