Minor fix for refinement and parent facets
Merge branch 'chris/refinement-cleanup' into next