Added workarounds for CSS