More facet dynamism fixes.