[ENGOPS-438] - Several fixes for release build
Merge pull request #48 from pamval/master

[ENGOPS-438] - Several fixes for release build