More fixes for creating output model
More fixes for creating output model

jjdekker/libminizinc,nathanielbaxter/libminizinc,jjdekker/libminizinc,nathanielbaxter/libminizinc,nathanielbaxter/libminizinc,tias/libminizinc,jjdekker/libminizinc,nathanielbaxter/libminizinc,jjdekker/libminizinc,tias/libminizinc