Fix resource associations