Width and wrap fixes