Tidy up some warnings in Windows.