Fix New project issues