Fixes for monitoring, scheduler references