Copyright cleanups and updates