Fixing few issues