Fixing some project setup issues