Fix association definitions