Fixed some things for the server deployment