More box model fixes.