Change provider
Small fixes