Response fixes