CS fixes
Updating the copyright year
CS fixes in the migration