Fix legal issues