Fix cli scaffold