Fix order of common custom actions