6.3.1: Windows compile fixes

This is a minor update to 6.3.0, fixing a few build problems on Windows.

See the 6.3.0 release for the really interesting stuff!