Fixes to generateRequestData