Fix small issues brought up in pull request

Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>