Fixed fname issues