Correct responder and make the few specs pass again