Fix few issues.