Minor Fixes

Fixed some bugs

Signed-off-by: Herb Bowie <hbowie@mac.com>