Some fixes. Goal: we should take attention to multiple threads programs.