Correct Licensing and Finalize changes