Pull request for needed patches

Notables should either save or not save... saving /wrong/ is very bad.