Resolve some sizing issues