Fixing a few unneccessary autos.