Some issues were fixed