more fixes
Merge pull request #15 from yashodha/CRM-12864

more fixes