Various fixes from cathedral sprint 2014 and after

I'll ping when this pull contains everything I'm doing right now.