Updates to be compilable on mac; copyright update