Change to handle new update semantics and new deps in 0.5.8