Server: small fixes
Server: small fixes