Fixes for some css modes