Color: some small enhancements.