Fix project restoration (where possible)