Additional copyright fixes