A few updates decribed by the commit messages