Fixed up some server stuff