some more fixes to associations