More height fixes