Fix some more stuff, break some other stuff...