Fixes for SRW/U responses