Fixes

Signed-off-by: Kevin Katzer <kevinktzr@gmail.com>