Fixed some server issues