More Response workarounds