More tweaks for some boxes