Fixes for task overdue