Fix bugs

Signed-off-by: Jae-Eun Choi <Jae-Eun.Choi@windriver.com>