Various fixes

Merged André Anjos requested to merge various_fixes into master

Closes #1 (closed) as well.

Merge request reports