Changes to the way sizes are handled