F::save bug fixes