Project setup
Project setup fixes