Small fixes on Color