Fixes to facets