Minor fixes.
Merge branch 'release0.3'