CRM-12681, fixes for j2