Tweaks for server
Merge branch 'master' of https://github.com/redatomstudios/CFIM