-- more fixes for CRM-12191