Fix response constructors