Added missing calls to safe_fname() and full_fname().