fix a few issues.