Fix some bugs

Sergio Gimenezrequested to merge
develop into master

Merge request reports