Minor changes to fix the RGB mode without affecting DASP mode.