Extra merge fixes