fix cultivator and analyzer for 1.7.x