Various minor additions.