Various scheduled task tweaks