Some issues were resolved