AVALANCHE: Fix some more warnings