Somehow I missed the models during the last commit...
More autopilot fixes.