#MIFOSX-991,#MIFOSX-979 Comment Fixes
Merge pull request #843 from lingalamadhukar/bug_fixes

#MIFOSX-991,#MIFOSX-979 Comment Fixes