Optimizations & improvements to errata module (rev 1)