Fix up a few things here...