Fix bug and minor taxonomy change