Fix vs coloring edge cases