error model fixes