+ Fix few issues