BB fixes for css compressor work-around