Few Fixes

Moritz Sichertrequested to merge
kordianbruck:master into master

Created by: kordianbruck

Fixes the import and a few minor things.

Merge request reports