Height adjustment fixes