Fix ID for JavaZone
Fix team