Fixing enclosures...