bstegmaier75's fix for the build issues in the mainline branch

I'm sure this will eventually be fixed in the mainline, but in the meanwhile...