Fix binning and color cycle bugs