Clean up some sizing issues