Server compliance fixes