Some fixes for new project layout