Updates for v0.79