More fixes for the changes to APscheduler. Arrrgh