Various build updates to resolve random project failures after decompression.