Fix for Jobs creating issues with registering listeners.  Fix up some more issues with CustomTools.

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