Fixing group issues on master instance (refs: #544)