Fix style regressions