Small changes to auto stuff.