Minor fixes
Merge pull request #680 from anandpdoshi/anand-july-7

Minor fixes