Quick fixes after CR of structured-responses