Fixed the build (old miriam-lib dependency, etc.).

[IgorRodchenkov]

I did it first in the (fork) master branch, by mistake, then merged into the develop and resolved minor easy conflicts, etc.