Fixed few issues