Create, update and fix few issues