fixes from @nathanleclaire

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>