More fixes to project setup