Fixd some synch issues and lock ordering. We now pass more tests