Initial fixes for CSS cascade on DHS