More width tweaks