Some small enhancements

See commit messages.