CRM-12964, fixes for generated data