Minor fixes on response handling