Fix team killing and some localization