My two small patches as a pull request