Some minor edits to reflect recent changes

Bit more tidying up.