fixes for v0.10