More fixes for group submissions