Various small v1 bugfixes

Markus Scheidgen requested to merge v1-misc-fixes into v1.0.0

Merge request reports