Fixed project issues