Rebuild. Fix some deps