Grayscale fixes