Some warning fixes for Windows