Copyright and authorship fix-ups for contributed code