Mark reads in a thread and other fixes