Some more fixes
Merge pull request #327 from owdqa/feature/OWD-33103-Refactor_Utils

Some more fixes