Resolved build issues that causes our build to fail on the second attempt