Copyright fixes and minor changes