Other server fixes
Merge branch 'master' of https://github.com/m4nu3lf/PDS_Project.git