Minor changes

See commit messages.