Analyses Fixes
Merge pull request #536 from smogon/479793b09887b7f9a622eb13a35c3945

Analyses Fixes