[#1404] Should reduce cppcheck warnings
[#858] Removed 'e's in build script paths