misc fix

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
Merge branch 'master' of github.com:maxwit/lablin