core: fix some small bugs.

N/A

Change-Id: I1ccc5b9c48d2055fb23bef39be24b615246fef68
Signed-off-by: yudatun <yudatun@gmail.com>