Org. assoc. fix and EE version compatibility