Improve assembly more

Timo Kochrequested to merge
feature/improve-fvassembler-again into master

Fixes some things forgotten before merging feature/improve-fvassembler-even-more.

Edited by Timo Koch

Merge request reports