Fixing #1059 and #888 and (again) #972
Merge pull request #1096 from OCHA-DAP/dev-dan

Fixing #1059 and #888 and (again) #972