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 
Ah, cool.  Well that shouldn't be a problem; Github tends to handle multiple pull requests making the same change without any problems, or at least it has the 1 or 2 times I've done that in the past.