Minor fixes
Merge pull request #548 from owdqa/feature/minor_fixes

Minor fixes