Simple fixes for failing tests... So we're not going to have a thread-safe iterator... This might be a problem for speculative execution