Workaround some sizing issues