Minor fixes for faceting