Fixed some server requests