Various fixes for the style engine