Pull Request - VIX-197 Compile Error and other fixes

Compiler errors corrected from recent merge