Fixes on server
Merge branch 'master' of https://github.com/Malow/NotDeadYet