Fixed some server problems