fix: a few regressions

Signed-off-by: Stephen L. <lrq3000@gmail.com>