Map fixes, stopScheduler fix.