Additional merge fixes