Miscellaneous merge fixes