Various fixes for group field