Minor bug fixes

Signed-off-by: epicfinley <epicfinley@gmail.com>