Minor adjustments
v0.0.7