Fix deprecations in config
Fix AR deprecations