More copyright fixes