minor changes

See commit messages.