Fix some associations which were magically broken