3.0 - Fix a couple things for external association trait