[FIX]Fixed some issue identified while testing