Fix height issues