Fixed responses cases missed by previous pass