Project setup fixes