Part 4 of CSS in-line rehaul - minor fixes