fix models and associations