Toolkit adjustments for misc fixes
Merge pull request #486 from owdqa/bug/mix_fixes

Toolkit adjustments for misc fixes