Fixed some bugs related to colors introduced with last patch.