Fix colour conversions