Updates

See commit messages.