fix few issues