Small tweaks to last PR.
Bump version.