Housekeeping and more work on the task queue