Fix errors from converting style.

There were a couple of silly load-order things, as well as
some typos I made :(