Fixing a few specs, but by far not all.

Currently there are too many specs that are failing. This commit is a
first step towards a ruby-2.0.0 compatible version.