Fix bugs affecting multiple projects