Fix up a couple things