Attempting to fix the build errors I'm getting in my pull request, but not on my local machine.