Fixes for issues found while testing
Merge branch 'develop' of github.com:yogeshchaugule/lpc into develop