more fixes for 32 bit color