Intermediate checkin - fixed some problems with the SPDX standard licenses