Patches applied as e11ab2a6e9628af6c37d4ae5e0faabde79bcea34 and
following (I made a few minor modifications for ondsel-solver).
Thanks.