Fixup from merge