Minor defs reordering