Fixed parts of with_project