Tiny changes extracted from various branches.