Snag fixes

This covers three of the five issues in this batch - https://github.com/whiteoctober/IATI/issues?milestone=1&state=open

I need to get back about the remaining two.

These are ready to go,  though I'm not going to be online properly till Monday, so I'd sooner wait till then before I merge them in and deploy.