Several correction (see changelog file)