Fix last few issues.