Windows build fixes for version 3.4.1