Fix some problems
More copyright info fixes