Fix up some problems and update copyright dates