Fix some color bugs