MinGW-w64 build fixes

I needed to make these small changes to get MinGW-w64 happy to build Cataclysm. For what it's worth, the changes don't *seem* to break anything else, so they should be safe to just pull in, but do please check, if able.