Colorimetry improvements (quick fix).