Fix bugs with body sizing