Add missing __init__. Update more deps.