Windows job supervisor and few small fixes