Fix some project properties problem
Merge branch 'windows'