Minor Server/Protocol Changes