Fixed few issues.