Cleaned up some warnings on Windows