fixes on save