Global crept in twice
Fail on opaque responses
Update build