Fix another bunch of copyright years, including fixing #397