Final tiny server side fixes