more respond_to fixes