Further height tweaks