Project setup fixes and other updates