Minor fixes, whitespace.
Merge branch 'minor'