Several fFixes
Merge branch 'dev-malkab' of https://github.com/GeographicaGS/elcano-iepg