Fix/compilation

Merged Thomas Fetzer requested to merge fix/compilation into master

Merge request reports