EXTColor fixes