AVALANCHE: Fix some coding convention issues, fix some warnings