Some fixed to dry run.