merge minor elevation fixes