Fix up a few things