Fix up a few things that missed the boat