Cleanup of some of the minor issues arising from #1551