Various fixes

Merged André Anjos requested to merge various_fixes into master

Outdates MR !1 (closed)

Merge request reports