Fixes to facilities