Rest of commits from Patrick