Fix bugs related to dynamic fact groups