Updated for upstream v0.6.4