Enable CMS; fix make in dirty tree