2.2 Compatibility fixes (mainy css)