HTTP Compliance fixes