Small fixes for height