Autocontrol - Two minor fixes