Fix sizing issues