Modifications to help fix multiplayer