fixes for v0.4