Some responder tidy ups