Enable FaceStat, and some cleanup.