server: minor tweaks

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Merge branch 'master' of https://github.com/PDSD-2014/georgescu-manea-bican