Fix some specifics services