Various fixes

Merged André Anjos requested to merge various_fixes into master

Merge request reports