Fix a few issues.