Some Color performance improvements