Fix Feedback issues
Signed-off-by: montyqin <monty.qin@gmail.com>