fix notices on save
Merge pull request #423 from dlobo/NoticeFixes

fix notices on save