Fix deprecations

Still need to update specs, don't merge yet.