Colour handling fixes.