Additional fixes for project references