a couple copyright cleanups