Various minor changes

See comments on individual commits for suggested discussion points.