Final merge fixes