Fixes to make name sizes always fit.