Final fixes to PokemonSwarm. Promise it is the last one.