Other small things

Signed-off-by: Josh Kilmer <srjek2@gmail.com>