dFinal - dialog and save fixes