Added several code improvements to mitigate import/export failures

Guest shared this idea 2 years ago