more fixes to avoid runaway processes