Final fixes for projects and forks