Blah, more fixes