Fixing wrong request and response wrappers. Closes #315