#80 bug fixes in CloserBase & Facility