Bugfixes

Markus Scheidgen requested to merge bugfixes into v0.10.2

Merge request reports