Fixes for Windows version of 0.64.0