Fix response problems