CRM-13299 - Code Corrections