Fix database problems
Fix service provider problems