More fixes.

Signed-off-by: Head <headswe92@gmail.com>