Some more fixes in the facets