fixup has_and_belongs_to_many + has_one relations