Minor fixes/cleanup

Michaël Roynardrequested to merge
development/fixes-cleanup into development/ranges

Merge request reports