Couple of post pulpv2 merge fixes