Fixed some small errors with parsing.