AVALANCHE: Fix more warnings reported by CppCheck