misc fixes

Ben Boeckelrequested to merge
ben.boeckel/diy:misc-fixes into master

Fixes from !55 (closed).

Merge request reports