Some improvements to match current project setup