Fix some bugs from Ms Hang