Fixed some project issues