Various fixes for color and SF