Update following breaking dep changes