Blah, small fixes