Fixed some bugs that I found with tests after the string parsing update.