Bugfixes

Closed Markus Scheidgen requested to merge bugfixes into v0.8.1

Merge request reports