JobMonitor fixes; FileCatalog dev