Minor cleanup to v0.8