Optimize needs report
Fix needs report
Fix html5shim reference [fixes #69530510]