Fixes for facets

One step towards trying to fix #276.