Some cleanup; add missing dependencies for spreads