Fix up a few issues