Modifiable model merge fixes