Fix two wrappers that don't have model as first argument

Problem: compile-time time arguments remapped to runtime arguments, in future the runtime arguments should come after the model