minor issues in groups after s3 refactoring