some more fixes in associations