replace a few autos with types