- Fix a few issues