Fixed some server dependencies