Some small fixes, a color directive