Substantial fix to sizing behaviors