Some minor fixing up triggered by @dsberry