Enclosure fixes