Follow up 8ed4e5e, and misc

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>