Address some issues

Address https://github.com/AIFDR/inasafe/issues/788
Address https://github.com/AIFDR/inasafe/issues/1172