[Utils] Clean up/Fix things found by Cppcheck

Changes/Commits I need help with are marked with [**\*RFC***]

4ff1085e1637e3afc5c583bf37645f0cf4ac4513 is the most important one imo.
seems a tab has crept in?