clean up response decoding
fixes for latest nightly