Fix up a few thangs