Fix parallel issues