Custodial fixes and copyrights