Nick/more initial models fixes