Fixes for my Linux VM build
Merge pull request #139 from JamesMGreene/vm_build_fix

Fixes for my Linux VM build.