fix some other small issues

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>