Additional tweaks to satisfy Win32 builds.
Merge branch 'master' of github.com:/apetrone/gemini