Kit and wizard plugin fix