Some more height tweaks