-- more fixes for CRM-12191
Merge pull request #245 from ravishnair/CRM-12191

-- more fixes for CRM-12191