fix few issues.