Adjustments to building

Here are a number of changes that I needed to make to allow me to do a build, arranged in order of my confidence from highest to lowest.

The first commit seems to be fairly clear, just requiring a change in case of the requested file name.  And I have a pretty good idea of why that didn't work for me but apparently did for other people.

The second commit also appears to be a legitimate issue, but I have no idea why I seem to be the only person hit by it.

The final commit was basically a stab in the dark, but it does allow be to do a successful build.