Fix closure handlers.