minor fixes for v0.8