more facet fixes