fixing few issues