Minor updates for issues found while testing
Merge pull request #332 from yogeshchaugule/develop

Minor updates for issues found while testing