Update the copyright year
Fix up neil check errors