Fix up color handling.