Fix & cleanup.
Merge branch 'v0.7.0'