Small changes to project setup