Random fixes

Signed-off-by: Junjie Mao <eternal.n08@gmail.com>