Fix some bugs in RC1.

Signed-off-by: 核心力量 <kernelforce@gmail.com>