Various merge fixes