Some commits that fix things up in Turtle.