minor fixes following code review
Merge pull request #1375 from ahgittin/fix-misc

minor fixes following code review