more colormap fixes