Demo server
Server minor fixes