more save() fixes