Fix smashed up commits: these two replace 2/7