Fixed more plfs/mdhim bugs