Fixed Auto stuff

Minor changes