- model fixes