Add some helpers for DataComposer and ContentMaker + various little corrections.