Further fixes merge conflicts