Small fixes

Pointed out by yejianfeng.blue@gmail.com - thanks!