more fixes for second wave of styles