More box fixes