More fixes on CUMODE_CHANGE notify handling to preserve other