http compat fixes