Bugfixes

David Schäferrequested to merge
bugfixes into develop

Stuff I come accross while working on fuzzy testing

Merge request reports