Fixing Zombie processes from builder.go