Fixes som setter/adder bugs introduced with assumed through models