More fixes for group directory