minor fixes regarding request and response