Fix stuff. (Amazing commit message, I know.)