fixes on org conf