Fix a slew of errors in the previous commit.