Fixed 1. and 2.

Merged Matteo Rossi requested to merge matteo into master

Merge request reports