Fixing has_many associations