Fix things
Merge branch 'master' of github.com:putsi/hairy-bugfixes