fix some inconsistences