Bug Fixes

Signed-off-by: Springo <kevinmxia@gmail.com>