Some applications fixes
Merge pull request #325 from owdqa/feature/OWD-33103-Refactor_Utils

Some applications fixes