Bugfixes with /pokemon