Fixes the CS handlers around services.