Fixed has_many relationships