Fix prep for save/update function calling.