HOTFOX: Fix facet bugs