Deal with copyright, fix macro error