New unit fixes (forgotten in previous round)

Sebastien Poncerequested to merge
sponce_fixUnits into master

Goes on top of !252 (merged)

Edited by Sebastien Ponce

Merge request reports