Fix for bug that was causing game to crash on launch on Windows.

A couple of slight changes/improvements.