CRM-13078, batch entry fixes