Misc fixes
Merge pull request #1 from nexse-swat-team/master

Misc fixes