Model fixes

This appears to fix the previous issues and make a few other adjustments necessary for the future DataRepeater+ kinds.