Minor fixes so I can run my Showdown-to-veekun importer.