Bugfixes related to the CSS optimization