Small improvements
Merge commit '532b0bb2de37b1ae06f0875f21751c71bfd7cffd'