A few small fixes for the Model-free saveframe setup.
Authored by: bugman 2010-10-24
Parent: [r84]
Child: [r86]
