Small improvements in facets.