Fixed colorScale issues