Fixed project setup (?)