Wow, fix some more stuff. Sigh. :P