Fixed our shit

Server bugs