Fixing provider issues