Bug Fixes for Groups