FIX: various error on ServiceProvider