More fixes upstream (tweaks to patches previously applied here)
Better sanity checking for broken CSS
Inform the user if broken CSS data exists in the message