Several tweaks coinciding with work on the eaHELP theme