Prepared solution for CCraft development

Some minor fixes