Silence deprecation warning
Fix failing specs