Small Autonomous fixes.