#992 - Can't delete a child group after deleting its parent - also fixes...

... #986