Color/Warning fix