[Panda] Some minor bug fix.