Small corrections in line with UML doc