Fixup various SPDX tags from the latest merge