Minor fixes and copyright updates