Pick some nits

Knock out several little issues.