Colormap fixes

@aashish24