WFD: Minor patch ver1.01

Fix minor bugs