Fix deprecated
Merge branch 'improvements' into add-providers
Remove bad permission