Server: lint fixes