In the end, I deleted all of my work (losing multiple hours) and redid it. At least it's easier the second or third time (I'd already redone this twice to see if I could make the errors go away =)).
