Misc fixes

Hi!

I didn't quite see the difference, but... This should pull in Redland... :-)

Kjetil