Fix few issues