Fix some sizing related issues