Fixed warnings re-introduced in Windows build via backwards patch