Fix some sizing issues