Fixed a few things server side