Apparently the extra scheduling fix reverted the age previous age patch. Re-applied.