Fix final sizing issues