Small fixes.
Merge remote-tracking branch 'gh/master'