Fix some colorization issues