Fix some issues with colors