Fixing color issues