More autoland fixes