misc fixes

License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>