Fix auton issues