Two issues were fixed