few issues fix