Various minor adds.