fix possible ConccurentModificationException on reload
add option to disable use of dispatch on make commands