Fixed serverside stuff (hopefully)