Fix specs
Fix deprecations