Fix shot source
Backport weapon names
Fix map collision false positives