Improve build task stability