Fixing some issues around associated objects (hopefully)