Just some general fixes. Move along.