Minor fixes.
Trying to merge.
Merge remote-tracking branch 'origin/master'