A few fixes for v0.13