Fix some dependencies.

2 failures when running `rake spec`.
Backport to fix CVE-2013-1756.