More bits and pieces to merge into the repository.