Some final merge fixes