Missed some merge changes