fix some issues

Signed-off-by: ahmadshah <ahmadshahhafizan@gmail.com>