Correcting Windows build errors