Minor fixes + copyright updates