Minor Server tweak