Fix up error in specifying dependencies.
Avoid overflow errors.
Get pause/resume tests passing.