adaptive_belongs_to bugfixes