Small bugfixes, to make cfmc deployment ready.