Fix block detector container bug + clean up