Some more fixes
Merge pull request #244 from aptara/Sushil

Some more fixes