diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index 7f90822a2..2f4d7c9b9 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -398,7 +398,6 @@ void D_SetupUserInfo ()
 		{
 			FBaseCVar **newcvar;
 			FName cvarname(cvar->GetName());
-			ECVarType type;
 
 			switch (cvarname.GetIndex())
 			{
@@ -900,7 +899,7 @@ void D_ReadUserInfoStrings (int pnum, BYTE **stream, bool update)
 
 void ReadCompatibleUserInfo(FArchive &arc, userinfo_t &info)
 {
-	char netname[MAXPLAYERNAME];
+	char netname[MAXPLAYERNAME + 1];
 	BYTE team;
 	int aimdist, color, colorset, skin, gender;
 	bool neverswitch;
@@ -914,7 +913,7 @@ void ReadCompatibleUserInfo(FArchive &arc, userinfo_t &info)
 
 	*static_cast<FStringCVar *>(info[NAME_Name]) = netname;
 	*static_cast<FIntCVar *>(info[NAME_Team]) = team;
-	*static_cast<FFloatCVar *>(info[NAME_AutoAim]) = (float)aimdist / ANGLE_1;
+	*static_cast<FFloatCVar *>(info[NAME_Autoaim]) = (float)aimdist / ANGLE_1;
 	*static_cast<FIntCVar *>(info[NAME_Skin]) = skin;
 	*static_cast<FIntCVar *>(info[NAME_Gender]) = gender;
 	*static_cast<FBoolCVar *>(info[NAME_NeverSwitchOnPickup]) = neverswitch;
diff --git a/src/namedef.h b/src/namedef.h
index 140b18768..44fe35e79 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -566,4 +566,3 @@ xx(NeverSwitchOnPickup)
 xx(MoveBob)
 xx(StillBob)
 xx(PlayerClass)
-xx(AutoAim)