fix most deprecations in the specs (still some left)