AVALANCHE: (Hopefully) fix some warnings reported by GCC and Clang