JobStoreCMT configuration + some minor changes