Pokemon parsing fixes