Fixing more lock which were being held during thread suspension