WIP: RGB saving fixes