missed some merge fixes