[Sync] Some more minor project sync