Correct a few issues