d5046f5 schedule tweaks + fix