Minor tweaks for group order
: