misc small changes

Signed-off-by: abbr <wenfred@gmail.com>