Bug fixes for projects coming from Windows