ITTE-1109 Fixed some concurency problems.