Multiplayer functionality fixes pt. 2