Updates for v0.13