Fixing a bug in ZIncBundleAvailabliityMonitor and small refactoring