minor fixes
Merge pull request #441 from yashodha/fix

minor fixes