Fixed some policy saving issues.