Minor fixes
Merge branch 'master' of github.com:UPCnet/maxserver.deploy