AutoControl: Minor adjustments