bugFixes- various issues

Merged Prashant Sonakar requested to merge bugFixes into master

Merge request reports