fixed minor bugs

Change-Id: Iecd9353220b6abe7c907c6b0fa76b36f662531a9
Signed-off-by: ShineISP <info@shineisp.com>