Fixes on Provider