Fixes following ProjectService refactoring