After merge fixes