Fixes for facilities