AVALANCHE: Fix some more Clang warnings