Color support fixes