VIX-197 - Pull Request - Compile Error Fixes

Compiler errors corrected from recent merge