AVALANCHE: Fix more gcc warnings reported by wjp