Fix CONTROL handlers.