Fixed some issues

Merged Wurschdbude requested to merge bachelor into master

Merge request reports