Few small fixes.
Merge commit 'ac6d416d15b863897430b8eb1e02bc9125417ea1'