CloseDB() and small Container Changes