Several fixes for version 1.5.1

Signed-off-by: Mike Howe <mike@mcsnetworks.com>