Fix issues in save task.
Fix PNA tasks.