Tidying for server
small tweaks before QA