Fix deadlocking issues on 2.10 - requires addThunk