Fix group reg for 8.5

A bunch of fixes so that group reg will work in 8.5. Closes #436 and also fixes #458 
Was this not already part of an earlier pull request?  I guess not, but I could have sworn I saw this already.