fix some warnings / remove TABs
Merge pull request #9011 from ricardoquesada/perf_fixes

Performance improvements
Merge pull request #8908 from zawasp/v3-source

fix some warnings / remove TABs