Autoheight improvements