Updates for v0.17