Various fixes and enhancements for the color kernel