Fixed some project setup