Fixed up associations