Changes for LC-2877

Included a couple of other editorial changes